From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Fri, 24 Aug 2018 11:04:49 +0000 (+0200)
Subject: Remove named pipe is not required
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~87
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=96468ddd16cd52ac6888e567d655aa3d1831b2be;p=siridb-server.git

Remove named pipe is not required
---

diff --git a/src/siri/net/pipe.c b/src/siri/net/pipe.c
index 5f5fc346..09652094 100644
--- a/src/siri/net/pipe.c
+++ b/src/siri/net/pipe.c
@@ -4,6 +4,7 @@
 #include <siri/net/pipe.h>
 #include <siri/siri.h>
 #include <xpath/xpath.h>
+#include <logger/logger.h>
 
 #define PIPE_NAME_BUF_SZ SIRI_PATH_MAX
 
@@ -28,13 +29,14 @@ char * sirinet_pipe_name(uv_pipe_t * client)
 }
 
 /*
- * Cleanup socket (pipe) file.
+ * Cleanup socket (pipe) file. (Unused)
  */
 void sirinet_pipe_unlink(uv_pipe_t * client)
 {
     char * pipe_name = sirinet_pipe_name(client);
     if (pipe_name != NULL)
     {
+        log_debug("Unlink named pipe: '%s'", pipe_name);
         uv_fs_t * req = malloc(sizeof(uv_fs_t));
         if (req != NULL)
         {
diff --git a/src/siri/net/stream.c b/src/siri/net/stream.c
index 18235ed4..ae1c644a 100644
--- a/src/siri/net/stream.c
+++ b/src/siri/net/stream.c
@@ -256,6 +256,7 @@ void sirinet__stream_free(uv_stream_t * uvclient)
 
     switch (client->tp)
     {
+    case STREAM_PIPE_CLIENT:
     case STREAM_TCP_CLIENT:  /* listens to client connections  */
         if (client->origin != NULL)
         {
@@ -282,14 +283,6 @@ void sirinet__stream_free(uv_stream_t * uvclient)
         siri_admin_client_free((siri_admin_client_t *) client->origin);
         siri.client = NULL;
         break;
-    case STREAM_PIPE_CLIENT:
-        if (client->origin != NULL)
-        {
-            siridb_user_t * user = client->origin;
-            siridb_user_decref(user);
-        }
-        sirinet_pipe_unlink((uv_pipe_t *) uvclient);
-        break;
     }
     free(client->buf);
     free(client);
diff --git a/test/test_pipe_support.py b/test/test_pipe_support.py
index c556be41..bde86f63 100644
--- a/test/test_pipe_support.py
+++ b/test/test_pipe_support.py
@@ -48,27 +48,28 @@ class TestPipeSupport(TestBase):
     @default_test_setup(1, pipe_name=PIPE_NAME)
     async def run(self):
 
-        pipe_client = SiriDBAsyncUnixConnection(PIPE_NAME)
+        pipe_client0 = SiriDBAsyncUnixConnection(PIPE_NAME)
+        pipe_client1 = SiriDBAsyncUnixConnection(PIPE_NAME)
 
-        await pipe_client.connect('iris', 'siri', self.db.dbname)
+        await pipe_client0.connect('iris', 'siri', self.db.dbname)
 
         self.assertEqual(
-            await pipe_client.insert(DATA),
+            await pipe_client0.insert(DATA),
             {'success_msg': 'Successfully inserted 10 point(s).'})
 
         self.assertAlmostEqual(
-            await pipe_client.query('select * from "series num_float"'),
+            await pipe_client0.query('select * from "series num_float"'),
             {'series num_float': DATA['series num_float']})
 
         self.assertEqual(
-            await pipe_client.query('select * from "series num_integer"'),
+            await pipe_client0.query('select * from "series num_integer"'),
             {'series num_integer': DATA['series num_integer']})
 
         self.assertEqual(
-            await pipe_client.query('select * from "series_log"'),
+            await pipe_client0.query('select * from "series_log"'),
             {'series_log': DATA['series_log']})
 
-        pipe_client.close()
+        pipe_client0.close()
 
         # return False